Mark main and serverAssert as weak symbols to be overridden #1232
+4
−13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Madelyn Olson <[email protected]>
madolson
changed the title
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## unstable #1232 +/- ##
============================================
+ Coverage 70.54% 70.55% +0.01%
============================================
Files 114 114
Lines 63144 63144
============================================
+ Hits 44543 44554 +11
+ Misses 18601 18590 -11
|
enjoy-binbin
approved these changes
Oct 26, 2024
zuiderkwast
approved these changes
Oct 28, 2024
| @@ -83,7 +83,7 @@ jobs: | |||
| steps: | |||
| - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1 | |||
| - name: make | |||
| run: make -j3 SERVER_CFLAGS='-Werror' | |||
| run: make all-with-unit-tests -j3 SERVER_CFLAGS='-Werror' | |||
There was a problem hiding this comment.
make flags before the target seems more common style. We do that in other places.
Suggested change
| run: make all-with-unit-tests -j3 SERVER_CFLAGS='-Werror' | |
| run: make -j3 all-with-unit-tests SERVER_CFLAGS='-Werror' |
| @@ -6810,7 +6810,7 @@ serverTestProc *getTestProcByName(const char *name) { | |||
| } | |||
| #endif | |||
|
|
|||
| int main(int argc, char **argv) { | |||
| __attribute__((weak)) int main(int argc, char **argv) { | |||
There was a problem hiding this comment.
Add a comment about why we add this attribute on main?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
At some point unit tests stopped building on MacOS because of duplicate symbols. I had originally solved this problem by using a flag that overrides symbols, but the much better solution is to mark the duplicate symbols as weak and they can be overridden during linking. (Symbols by default are strong, strong symbols override weak symbols)
I also added macos unit build to the CI, so that this doesn't silently break in the future again.